a348fcd72416f2337f3a3e9b96a01e6fb08d9b58,advanced/src/main/java/org/neo4j/server/webadmin/console/GremlinSession.java,GremlinSession,evaluate,#String#,60
Before Change
{
resetOutputWriter();
Transaction tx = database.graph.beginTx();
List<Object> resultLines = (List<Object>) scriptEngine.eval( script );
tx.success();
tx.finish();
// Handle output data
List<String> outputLines = new ArrayList<String>();
// Handle eval() result
String[] printLines = outputWriter.toString().split( "\n" );
if ( printLines.length > 0 && printLines[0].length() > 0 )
{
for ( String printLine : printLines )
{
outputLines.add( printLine );
}
}
if ( resultLines == null
|| resultLines.size() == 0
|| ( resultLines.size() == 1 && ( resultLines.get( 0 ) == null || resultLines.get(
0 ).toString().length() == 0 ) ) )
{
// Result was empty, add empty text if there was also no IO
// output
if ( outputLines.size() == 0 )
{
outputLines.add( "" );
}
}
else
{
// Make sure all lines are strings
for ( Object resultLine : resultLines )
{
outputLines.add( resultLine.toString() );
}
}
return outputLines;
}
catch ( ScriptException e )
{
After Change
*/
@Override
@SuppressWarnings( "unchecked" )
public String evaluate( String script )
{
try
{
List<Object> resultLines = runScript( script );
StringBuilder result = new StringBuilder();
result.append( outputWriter.toString() );
if ( resultLines.size() > 0 )
{
for ( Object resultLine : resultLines )
{
result.append( resultLine.toString() );
}
}
return result.toString();
} catch ( ScriptException e )
{
return e.getMessage();